merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 20 Mar 2008 18:35:40 +0000 (12:35 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 20 Mar 2008 18:35:40 +0000 (12:35 -0600)

Trivial merge